From 751a92f9aa17fb77c40d05b05f461f9cc1304caa Mon Sep 17 00:00:00 2001 From: Anton Gladky Date: Mon, 16 Nov 2020 21:39:44 +0100 Subject: [PATCH] Remove Qt-files from non-qt binaries. (Closes: #974923) --- debian/control | 1 - debian/rules | 42 +++++++++++++++++++----------------------- 2 files changed, 19 insertions(+), 24 deletions(-) diff --git a/debian/control b/debian/control index 437c15888..2c6e3127a 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,6 @@ Build-Depends: chrpath, libavcodec-dev, libavformat-dev, libavutil-dev, - libboost-all-dev, libdigest-md5-perl, libdouble-conversion-dev, libeigen3-dev, diff --git a/debian/rules b/debian/rules index 3d3b73948..ebf1a3d97 100755 --- a/debian/rules +++ b/debian/rules @@ -9,18 +9,22 @@ export JAVA_HOME=/usr/lib/jvm/default-java dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python3 --with javahelper extra_flags += \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DBUILD_SHARED_LIBS=ON \ -DCMAKE_C_COMPILER=mpicc \ -DCMAKE_CXX_COMPILER=mpic++ \ + -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -latomic" \ + -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed" \ + -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DHDF5_IS_PARALLEL=OFF \ -DVTK_BUILD_DOCUMENTATION=ON \ -DVTK_BUILD_EXAMPLES=OFF \ - -DBUILD_SHARED_LIBS=ON \ -DVTK_BUILD_TESTING=OFF \ - -DVTK_USE_TK=ON \ - -DVTK_WRAP_JAVA=ON \ - -DVTK_WRAP_PYTHON=ON \ - -DHDF5_IS_PARALLEL=OFF \ + -DVTK_EXTRA_COMPILER_WARNINGS=ON \ + -DVTK_MODULE_ENABLE_VTK_RenderingQt:STRING="YES" \ + -DVTK_MODULE_ENABLE_VTK_RenderingTk:STRING="YES" \ + -DVTK_MODULE_ENABLE_VTK_utf8:STRING="YES" \ + -DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion:BOOL=ON \ -DVTK_MODULE_USE_EXTERNAL_VTK_eigen:BOOL=ON \ -DVTK_MODULE_USE_EXTERNAL_VTK_expat:BOOL=ON \ -DVTK_MODULE_USE_EXTERNAL_VTK_freetype:BOOL=ON \ @@ -41,24 +45,13 @@ extra_flags += \ -DVTK_MODULE_USE_EXTERNAL_VTK_tiff:BOOL=ON \ -DVTK_MODULE_USE_EXTERNAL_VTK_utf8:BOOL=ON \ -DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=ON \ - -DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion:BOOL=ON \ -DVTK_PYTHON_VERSION:STRING=3 \ - -DVTK_EXTRA_COMPILER_WARNINGS=ON \ - -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \ - -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed" \ - -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \ - -DVTK_MODULE_ENABLE_VTK_RenderingQt:STRING="YES" \ - -DVTK_MODULE_ENABLE_VTK_RenderingTk:STRING="YES" \ - -DVTK_MODULE_ENABLE_VTK_utf8:STRING="YES" + -DVTK_USE_TK=ON \ + -DVTK_WRAP_JAVA=ON \ + -DVTK_WRAP_PYTHON=ON \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo override_dh_auto_configure: -ifneq (,$(filter $(DEB_HOST_ARCH),$(noqt_archs))) - echo '' > $(CURDIR)/Views/Qt/module.cmake - echo '' > $(CURDIR)/GUISupport/QtWebkit/module.cmake - echo '' > $(CURDIR)/Rendering/Qt/module.cmake - echo '' > $(CURDIR)/GUISupport/QtOpenGL/module.cmake - echo '' > $(CURDIR)/Examples/GUI/Qt/SimpleView/CMakeLists.txt -endif dh_auto_configure -- $(extra_flags) override_dh_auto_clean: @@ -75,8 +68,11 @@ override_dh_auto_install: # Correct headers for paraview mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk.jar $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk9.jar sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-9.0/VTK-targets.cmake + +override_dh_install: + dh_install rm -rf $(CURDIR)/debian/tmp/usr/share/licenses find $(CURDIR)/debian/libvtk9-dev/ -name "*Qt*" -exec rm {} \; || true + find $(CURDIR)/debian/libvtk9-dev/ -name "libvtkRenderingPythonTkWidgets.so" -exec rm {} \; || true find $(CURDIR)/debian/libvtk9/ -name "*Qt*" -exec rm {} \; || true find $(CURDIR)/debian/libvtk9-dev/usr/include/ -name "Q*" -exec rm {} \; || true - find $(CURDIR)/debian/libvtk9-dev/ -name "libvtkRenderingPythonTkWidgets.so" -exec rm {} \; || true -- 2.30.2